Merge: Adjust to recent gnulib change for @GUARD_PREFIX@.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 21:53:53 +0000 (14:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 21:53:53 +0000 (14:53 -0700)

Trivial merge